From 7033f1164710d1065fe278dbef826673af85abbd Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 18 Sep 2009 14:45:40 +0100 Subject: [PATCH] Revert 20221:fc94d586d02f Signed-off-by: Keir Fraser --- tools/python/xen/xend/XendDomain.py | 2 -- tools/python/xen/xend/XendDomainInfo.py | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 7a125fb23a..594d49298a 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -347,7 +347,6 @@ class XendDomain: if self.is_domain_managed(dom): self._managed_config_remove(dom.get_uuid()) del self.managed_domains[dom.get_uuid()] - dom.unlink_xapi_instances() dom.destroy_xapi_instances() except ValueError: log.warn("Domain is not registered: %s" % dom.get_uuid()) @@ -486,7 +485,6 @@ class XendDomain: if domid in self.domains: del self.domains[domid] - info.unlink_xapi_instances() info.destroy_xapi_instances() else: log.warning("Attempted to remove non-existent domain.") diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 3669052af5..124c910768 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -4043,18 +4043,6 @@ class XendDomainInfo: except Exception, exn: raise XendError('Failed to destroy device') - def unlink_xapi_instances(self): - from xen.xend import XendDomain - if XendDomain.instance().is_valid_vm(self.info.get('uuid')): - # domain still exists. - return - - for vbd_ref in self.info.get('vbd_refs'): - dev_info = self.info['devices'].get(vbd_ref)[1] - vdi = XendNode.instance().get_vdi_by_uuid(dev_info['VDI']) - if vdi.getVBDs().count(vbd_ref): - vdi.removeVBD(vbd_ref) - def destroy_xapi_instances(self): """Destroy Xen-API instances stored in XendAPIStore. """ -- 2.30.2